Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 14 May 2010 07:46:03 +0000 (07:46 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 14 May 2010 07:46:03 +0000 (07:46 +0000)

Trivial merge